Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Mon, 28 Aug 2017 19:23:03 +0000 (21:23 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Mon, 28 Aug 2017 19:23:03 +0000 (21:23 +0200)
commitee23f267ca7d0a19d340df1f381a61eb5ff686a5
tree95697a3857e9a4700d05a62b2a1fe8be129068fb
parent7cac248d4c5699801dda9dac4ee552f1c390cfc0
parent2ebb12ad9f62fbdfdd3b08e5c5bbed07f40eb286
Merge branch 'upstream'